DO NOT MERGE - Merge Android 13 Bug: 242648940 Merged-In: I2b3f7e565684cc3ab14ee15fa28f763752c8ae36 Change-Id: I6840cb093f76561a6a813bd53b23d0f25de525da